From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 30 Oct 2013 22:32:26 +0000 (-0400)
Subject: Revert "overviewControls: Always allocate the actor its full size"
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3112
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e6c28cf509b794d10fcbae34e94fbf85d932d494;p=gnome-shell.git

Revert "overviewControls: Always allocate the actor its full size"

This reverts commit f5a9dbb348632864095179f5f88a6fef9707e7c7.

This broke the alignment of the workspace thumbnail widget. I don't
know why, but let's not break things if we can...
---

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 1a0645718..98480c84d 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -68,7 +68,7 @@ const SlideLayout = new Lang.Class({
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX + this._translationX;
-        actorBox.x2 = actorBox.x1 + availWidth;
+        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
         actorBox.y1 = box.y1;
         actorBox.y2 = actorBox.y1 + availHeight;
 
@@ -323,6 +323,11 @@ const DashSlider = new Lang.Class({
 
         this._dash = dash;
 
+        // SlideLayout reads the actor's expand flags to decide
+        // whether to allocate the natural size to its child, or the whole
+        // available allocation
+        this._dash.actor.x_expand = true;
+
         this.actor.x_expand = true;
         this.actor.x_align = Clutter.ActorAlign.START;
         this.actor.y_expand = true;